Merge pull request #398 from tempname/master