update develop
more changes
Merge branch 'develop2' into develop

Conflicts:
	README.md
Merge pull request #3 from cleibler/develop

Develop