whoops bug
Merge pull request #104 from SamLau95/bugs

whoops bug