Removed defaults
Bumped version number
Merge branch 'release/0.1.6' into dev