Merge pull request #1 from unepwcmc/decio

Looks good :+1:
Merge pull request #2 from unepwcmc/query_builder

Query builder
removed commented code
Merge branch 'master' into query_builder
added missing files to git