test
Merge branch 'develop' into test

Conflicts:
	README.md
Merge pull request #3 from ariel200/test

test