Merge pull request #70 from ctjong/develop

Version 1

Merge pull request #33 from ctjong/develop

Beta version

Merge pull request #19 from ctjong/develop

Alpha Version

move files from old repo