redoing REL-2099 due to git confusion
Merge pull request #114 from tpolecat/bugfix/REL-2099-redo

redoing REL-2099 due to git confusion