Simplified canAdminister() method
Merge pull request #45 from MichaelThessel/validation_fixes

Simplified canAdminister() method