Merge pull request #25 from rootcoma/master

fixing skip and score recap
Merge remote-tracking branch 'upstream/master'