Merge pull request #30 from fierarul/master

Various data viewer changes