Fixed handling of current player ID, fixes #8
Merge branch 'feature/rules' into develop