minor fixes
updated README
Merge branch 'dev'