Added debug print statements
Merge branch 'master' into luke