Merge pull request #41 from stefanheimes/master

Bugfix for limit on all views