cleanup
Merge pull request #388 from nZEDb/dev

cleanup