some private to protected changes
Merge branch 'dev'
Merge branch 'master' of github.com:Kovo/PzPHP