Merge pull request #1 from mstein/master