Added other viewer using OAPoC
Merge branch 'tmpbranch'