Merge pull request #24 from WrongEntertainment/develop

Develop
Update Changelog
Merge pull request #27 from WrongEntertainment/master

update develop branch