Database changes implemented
Merge origin/master