Merge pull request #1 from mschubert/master

pull from upstream