final bug fixes
Merge branch 'master' of https://github.com/ikavvour/database-server-mde519