updated in enhancement 2.
added in enhancement 2.
Merge remote-tracking branch 'remotes/origin/enhancement'

Conflicts:
	LICENSE