updated for source
remove debug
Merge branch 'dev'