Merge branch 'master' into dev
bumped version number, added config instructions
Merge branch 'dev'