Nathan Chiu

Results 2 issues of Nathan Chiu

New pull request to resolve merge conflicts