Removed extra code left from merge
Merge pull request #13 from teemingchew/master

Removed extra code left from merge