little cleanup
manually adding bug fixes/changes by bblanchon - merge requests go through dev branch
Merge branch 'master' of github.com:nZEDb/nZEDb
rewrite
Merge pull request #121 from nZEDb/master

Merge branch 'master' of github.com:nZEDb/nZEDb