Released 0.6.1 version - pull from #11