Merge pull request #117 from gunnarhaslinger/master