Merge pull request #4 from aldrik/master