0.1.7 from master branch