rcannood Merge pull request #158 from dynverse/devel