Merge pull request #1 from magicdict/master