merge of version 4
Merge branch 'master' of https://github.com/dowstreet/example

Conflicts:
	README.md