Merge branch 'develop' into method_filter
Removed some debug statements.
Merge branch 'develop' into method_filter