fixed bug
Merge pull request #106 from SamLau95/bugs

fixed bug