v 0.6.1

Latest changes for v0.6.1