Merge Habib's fixes

Jira issue: WP-1319
Remove noisy console output.

Jira issue: WP-1318
Merge pull request #76 from TobyEalden/habib-fixes

Merge and bug fix Habib's changes