Fix bug 456
Merge branch 'BUG456'

Conflicts:
	ReadMe.txt