Fixed update function
Merge branch 'master' of http://github.com/mekarpeles/waltz into 0.1.63-lazyauth