Merge pull request #4 from vasichkin/master

Fixes and improvements
Fixed setup file
Fix after refactoring
Merge pull request #5 from dieu/master

Fixed setup file