Added ManualConfig
Updated Version Number
Merge branch 'manual' into 4.1.0