Merge pull request #115 from alfredh/master