Merge pull request #18 from ctjong/develop

Alpha Version
Merge pull request #19 from ctjong/develop

Alpha Version