Dev staging

Merging the 0.1.4 release to master