closes #3681
Merge pull request #16 from jdcc/dev

closes #3681