Fixing bug 3
This is the correct fix for bug 3
Merge pull request #3 from ColinWragg/feature/bug3

Feature/bug3