Amend code.
Merge pull request #2 from maddie/master

Amend code.