integrate viewer
Merge pull request #248 from irvs/issue247

integrate viewer