Merge pull request #12 from nZEDb/dev

Dev
Merge pull request #13 from nZEDb/dev

Few minor changes.
Add a space for the group.