Merge pull request #15 from fezfez/master

Bug fix