Added update functionality.
Merge origin/master