Use Protected Fields
Merge branch 'develop'