Merge pull request #4 from williecheong/master

Pulling changes from the new sources development