Merge pull request #2 from ltfschoen/20140424

Fix merge
Debugging display not working
Merge branch 'master' into 20140424