Merge pull request #62 from kberg/fix174.