Finished authing.
Merge remote-tracking branch 'marvin/master'
Small.
Defaults on index.
Typo.