safer delta parsing
Merge branch 'master' of github.com:paylogic/codereview