Merge pull request #17 from ImMrSn/develop

Develop
2 update
Revert "2 update"

This reverts commit d66cbf9dd4fb9127eb4c80cafe039d979dc03cd2.
Update
Merge remote-tracking branch 'origin/bagfix' into develop
Update
Merge remote-tracking branch 'origin/develop'