Merge pull request #13 from justinmclean/master

minor tweaking