fixed problem2
Merge branch 'release1' into problem2

Conflicts:
	README.md
Merge branch 'problem2' into release1