Changes and version updates
Merge pull request #146 from tpaviot/tp/prepare-0.6-beta

Changes and version updates