performance tuneup
Merge origin/master