Merge pull request #300 from benjello/dev

Fixing inflate