First working revision
Merge branch 'release/0.1'