closes #5163
Merge pull request #22 from jdcc/dev

closes #5163