remove incorrect exception throwing
allow access to private fields
Merge branch 'master' into dan-dev