Fix & improve
Merge pull request #27 from termosa/master

Fix & improve