Updated according to stack overflow feedback
Updates from more comments
Merge pull request #17 from Scrier/issue_16

Issue 16