Merge branch 'dev/0.1.00'