close #3
close #18
Changing version for pypi