Failing tests #19
Merge pull request #21 from doxxan/issue_19

Issue 19