Fix issues 5 and 6
Merge pull request #7 from jahan-addison/5&6

Issue 5&6