Fix mapping bug #230
Fix some phpdoc and CS #230
Update requirement of connector bundle to beta 3 #230