add debug flag
Merge branch 'develop'