Preparing release 0.1
Back to development: 0.2
Merge master