Merge pull request #49 from qw5414/develop

Develop