Fixed #16
Merge pull request #17 from Happyr/issue-16

Fixed #16