Small changes and readme update
Merge branch 'develop'