jhrcook Merge pull request #6 from jhrcook/devel