Updated some sanitization as per @darylhuston
Merge branch 'new-branch'