bugfix #242
Merge pull request #371 from colorhook/master

bugfix #242