Merge remote-tracking branch 'kagetsuki/master'
WIP add entry number
Merge remote-tracking branch 'kagetsuki/master'