fix for ticket 33
fix for ticket 34
fix for tickets 17 & 24
Merge pull request #19 from joemariedimzon/master

fix for ticket 33