Added bugfix
Merge pull request #101 from jrs1498/master

Added bugfix