Fixed bug in update methods
Merge origin/master