Code cleanup and review.

Added default files.
Merge branch 'develop' into release-1.1
Merge branch 'release-1.1'