Added ability to define custom.json configuration file
Merge branch 'master' into gh-pages