Merge branch 'dev', release version 0.6.2