Fix issue53
Fix hotfix
issue53 done
Merge branch 'iss53'

Conflicts:
	file2