gaynorr Merge pull request #1 from gaynorr/devel