caught merrill!

fixes issue #3
Merge pull request #4 from catomania/test-branch

caught merrill!