Merge pull request #1 from bartholdja/master

pull request...
Merge pull request #7 from fercol/master

Merge pull request #1 from bartholdja/master