changed all privates to protected
Merge branch 'dev'