Merge pull request #1 from semajed/revamp

Revamp
Merge branch 'master' into revamp