Merge pull request #258 from MartinNowak/master