Merge pull request #94 from blueful/master

Related to #91
Fixing #89
Merge pull request #2 from krasimir/master

0.3.27