Updated default YML data for new setup
Fixed minor bug in the wiki section
Merge branch 'shineisp/sandbox'