rcannood Merge pull request #22 from dynverse/devel