Display problem fixed, clean up still needed
Merge pull request #2 from umcsdon/master

Display problem fixed, clean up still needed