Merge most of the changes that will be part of the release 0.1.2

Merge most of the changes that will be part of the release 0.1.2 #81