removed debug calls.
Merge origin/master