Revert "2014-7-22"

This reverts commit 943cc0a532968bbccde6dc8530b1e5a371568635.
2014-8-16 by Tshoes

2014-8-16 update