Merge pull request #144 from Team-H/develop

update master branch