wilsontom Merge pull request #42 from aberHRML/devel