added debug state
Merge branch 'develop'