fixed sanitization methods
Merge branch 'dev'