stable 1
Merge branch 'reformatting' of https://github.com/LBliss/pickling into reformatting