Results 1 issues of Peter

**Warning:** This PR also contains #40 - it might be better to check and merge that one first and then separately check this PR after. This pull request adds hooks!...