Fixes #18
Fixed author marking is updated
Cleanups