Merging dev to master for 0.1.6