Merge pull request #95 from tomjoseph83/issue80

Fix two issues in Issue #80