Merge pull request #35 from ndmitchell/master