Merge pull request #106 from thotsch/master