Rxoygen2 changes.
Merge branch 'master' of https://github.com/b-steve/admbsecr