minor changes
STABLE
Merge remote-tracking branch 'origin/master'