Merge pull request #1 from m-e-conroy/master

pull upstream