Merge pull request #7 from fourier/master