Update 20141001

Fixing and fixing

- Happy National Day!