rcannood Merge pull request #7 from rcannood/devel