Fixed version number
Merge remote-tracking branch 'origin/v0.1.7' into v0.1.7
Imported all latest fixes