Merge pull request #15 from fezfez/master

Bug fix
Merge pull request #16 from fezfez/0.1

Merge pull request #15 from fezfez/master