Merge pull request #195 from onnokort/master