bugs
Merge pull request #76 from SamLau95/bugs

bugs