Merge pull request #4 from dedeckeh/master