merge latest version

pull in changes from cybereality