Syncing code between playground and project
Merge pull request #133 from jocelynlih/bug-fixes

Syncing code between playground and project