Last one for tonight.
Merge pull request #259 from nZEDb/dev

Last one for tonight.