Dev

Syncing latest development of fix8viewer