Update
Merge pull request #11 from origin/master#hotfixmaster
Updating Changelog
Merge from master