tjmehta/101 — pull request #35 by tjmehta (2014-12-15 08:11:33+00:00)
Title: Fixes and additions

Closes #21, #22, #23