v0.6.1 - Fixed some issues