Merge pull request #587 from goldrush/master

reverse