This closes #163
Merge pull request #164 from eprogramming/contrib

This closes #163
this closes #158
Merge pull request #165 from eprogramming/contrib

this closes #158
SafeResourceBundle package change
Merge pull request #166 from eprogramming/contrib

SafeResourceBundle package change