Merge pull request #1 from arago/master

merge
refactor viewapp
refactor viewapp
Merge pull request #146 from p1tz/master

refactor view application