Introduced a compile switch for debug mode
Merge remote-tracking branch 'origin/master'