fixed "unlickly bugs"
Merge origin/master