Merge pull request #26 from ElliotSalisbury/master

Bug Fixes