Getters Setters added
Merge origin/master
DataBase delete modified