Merge pull request #3 from dedeckeh/master