clean up
prepare merge
Update README.md

added some hints
merged from master