Merge pull request #1 from william1lai/master

Latest as of 9-23-2013
Keeping function names consistent
Merge pull request #2 from edu5/master

One commit. Up-to-date as of September 23, 2013.