Fix for inner class registration check
Merge branch 'master' of github.com:JohnReid/myrrh