Merge pull request #68 from johnstevenson/devel