Developing
Refactoring
Adding missing configuration files
Adding filtering options
Merge branch 'dev'