Merge pull request #7 from gslender/master

Merged this with upstream too