Redo stage 1.
Merge pull request #137 from nZEDb/dev

Redo stage 1.