small changes
ver 2.0
Merge branch 'kokorins-master'