Topic
Merge branch 'master' into test

Conflicts:
	README.md
Merge pull request #1 from borgelino/topic-test

Topic