fix for ticket 22
Merge pull request #17 from joemariedimzon/master

fix for ticket 22