Added synchronous update.
Merge branch 'bugfixes'