Fixing PR
Merge pull request #15 from ianbarber/master

Fixing PR