Merge branch 'develop'
Merge branch 'release/v0.6.0'
add link to faq on wiki
Merge branch 'master' into develop