Merge pull request #1 from eschaefer/master