first working beta
Merge branch 'release/0.1'