code fixes + readme update
Merge branch 'development'