Merge pull request #17 from ImMrSn/develop

Develop
Update
Merge remote-tracking branch 'origin/bagfix' into develop