Merge habib's changes

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

Merge habib's changes