Merge pull request #48 from ryanpcmcquen/patch-1