Merge branch 'dev'
Merge branch 'dev'. Closes #5
Add !default statement for variables

It will allow user to overwrite properly the values, before including defaults values.