Work in progress.
Merge github.com:momiga/unsnap