Cleanup while publishing 0.6.1
Merge pull request #343 from dungpa/updates

Cleanup while publishing 0.6.1