fix #32 fix #33 fix #34 fix #35 && git push
Merge pull request #36 from doodzik/v1.0.1

V1.0.1