added filter
more changes
Merge branch 'master' of github.com:kekskrise/esh-2014