Removed trace print
Merge branch 'develop'