Sorry, left debug code in. Fixed user position updating.
Merge branch 'master' of https://github.com/alvinlao/charm