wp-1083. Keep on doing the 'nasty hack'
Merge pull request #5 from gguowei/wp-1083

WP-1083. Keep on doing the 'nasty hack'