closes #86
Merge pull request #87 from steakknife/fix__86

closes #86