Merge pull request #1 from nrporter/master

pull