Fixed bugs
Merge pull request #77 from johnttan/team#68

Fixed bugs