Typo
Merge branch 'master' of github.com:hadesgames/supervision-marking
Some code cleanup
Some refactoring
Merge branch 'master' into prototype