Merge pull request #1272 from akbargumbira/develop

Some fixes to wrap up the release