rcannood Merge pull request #22 from rcannood/devel