Merge pull request #167 from tobiasd/more_inflate