Add additional configuration options
Merge branch 'master' of git@github.com:tgrk/vffov.git