Refactoring
Change if
v0.1.1
Merge branch 'dev'