#2
#3
Merge branch 'issue_2'

Conflicts:
	index.php