0.6.1 release

update master to 0.6.1