Setting up option for author control.
Final fixes to resolve #118
Merge remote-tracking branch 'origin/2.0.x'