Merge master to release 0.1

Merge master to 'stable' release 0.1