Upkeep
Merge branch 'master' of https://github.com/dechov/snark