Merge pull request #1 from bartholdja/master

pull request...