attempt at fixing issue 12
Merge pull request #17 from jlambert121/issue_12

attempt at fixing issue 12