Refactor, make version 0.1.7-devel