Change order of punching and reranking
Merge branch 'master' of github.com:3amice/minerva