Merge pull request #378 from dropdeadfu/master