parse resume
Merge remote-tracking branch 'hack/master'