v0.6.1

Code cleanup and little bug fixes.