Revert stage 1.
Merge pull request #15 from nZEDb/dev

Revert stage 1.