Debugging display not working
Merge branch 'master' into 20140424
Merge pull request #3 from ltfschoen/20140424

a