injones Merge pull request #11 from injones/devel