Merge pull request #57 from zoldar/master

Dependency issue fix