Merge pull request #1 from mehere/dev

weechong-ong wants to merge 58 commits into dev-wee  from dev