Merge pull request #267 from Micha-kun/master

Fix for bug #231