Merge pull request #3 from Smarre/master