Pickle Merge pull request #1 from serg-z/master