fixes #45 and #51
Merge branch 'master' of https://github.com/lihaoyi/upickle