rcannood Merge pull request #32 from dynverse/devel