Majro revamp.
Fixed test.
Merge pull request #14 from node-modules/revamp

Major revamp.