Merge pull request #116 from dedeckeh/master