Merge pull request #88 from dedeckeh/master