Merge pull request #1 from buerkle/master