sbohlen Merge pull request #155 from 304NotModified/patch-1