Scoreboard

Add scoreboard to fix #16