Merge branch 'devel'
tweaked readme
tweaked readme
Merge branch 'master' into devel