More code style bugfixes
Enhanced README documentation
Merge branch 'develop'