Merge pull request #307 from jerv13/master

Update view, add basic input filter
Merge remote-tracking branch 'upstream/master'