Fixes #120
Merge pull request #121 from jlund3/master

Fixes #120