Changes to support 5.2 update
Refactoring made to access control to make it more DRY
Merge pull request #100 from bcrochet/52_update

Bringing in the 5.2 update branch!