fix for ticket 29
fix for ticket 36
fix for ticket 39
Merge pull request #20 from joemariedimzon/master

fix for ticket 29