Merge pull request #30 from stanleygu/master

New modules