Merge pull request #18 from tavaron/master

rawview2
Merge pull request #19 from tavaron/origin/patrick

Merge pull request #18 from tavaron/master