closes #5
Merge pull request #6 from steakknife/fix__5

Closes #5