Improved syntax for #21, improves on pull #22.
Fixed typo.
Merge pull request #23 from isaacrg/master

Improved syntax for #21, improves on pull #22. Also fixes typo.