Merge pull request #2 from catmanol/master

[code] fixed namespace and add database changes
Merge pull request #1 from alexandru1985/master

Merge pull request #2 from catmanol/master