more details
swome more
again
conflicting changes
Merge branch 'experimental-test' into develop

Conflicts:
	README.md