rcannood Merge pull request #21 from dynverse/devel