Merging visualization branch to master