Fragment implmentation added
Merge remote-tracking branch 'origin/version1' into version1
code cleanup.