Merge pull request #472 from huth/fixes