Merge pull request #1 from noobee/master

pull request for you to update your master branch