Merge pull request #44 from anythinkDev/tophDev

Toph dev