speed optimization
Merge branch 'master' into beta
fixed 'duplicates issue'
release date
Merge branch 'master' into beta

Conflicts:
	ChangeLog