removed duplicate files
Merge branch 'master' into tags-master
code simplification
Merge branch 'master' into tags-master
VERSION => 2.2 beta 7
Merge branch 'master' into tags-master