bug fix 123
Merge branch 'bugfix123'

Conflicts:
	GAP.html