Implemented Update functionalities
Merge branch 'master' into stable