preparedstatements and input fixded
Merge branch 'master' into db_fix_w_input
fixed regex