closes #3655
Merge pull request #15 from jdcc/dev

closes #3655