Cleanups.
Merge branch 'Version_1.0.3'