Fix for issue #18
Really fixes issue #18 and #20
Merge pull request #21 from deiga/issue-18

Thanks