Merge pull request #469 from blinkseb/master