Capseled options
Outsourced options and data
Merge branch 'master'
Merge branch 'master'
Adding a source file is possible now