update 11/2/20141
Merge remote-tracking branch 'origin/master'