Merge pull request #1 from jzaefferer/master