Merge voxview.js from master