Nightly Commit~

Fix some of bugs
Merge pull request #75 from Zjazure/release-candidate

Nightly Commit~