Added note and removed debug stuff.
Merge branch 'develop'