Merge feature/mysqli_oop branch