issue 54 fixes
more issue 54 fixes
Merge branch 'iss54'

Conflicts:
	index.txt