Merge pull request #74 from N-Pex/master

View optimizations