Revert "Here are the final big changes!"
Merge pull request #20 from sundaisun/revert-19-master

Revert "Here are the final big changes!"