Bump version, 0.1.7
Resloved conflicts