More additions, change back to other way.
Merge pull request #135 from nZEDb/dev

More additions, change back to other way.