- complete issue 3
Merge branch 'master' into i-3

Conflicts:
	issue-1.txt