Accidentally trounced on Ankur's updates. Putting his work back.
Merge pull request #93 from jocelynlih/paul

Accidentally trounced on Ankur's updates. Putting his work back.