Added configuration options
Completed basic configuration
Merge branch 'add-config' into develop