Merge branch 'dev'
Version 0.6.9