Update from spreadsheet
Merge pull request #110 from aliceingame/master

Update from spreadsheet