Converting patch.
Merge pull request #154 from nZEDb/dev

Converting patch.