Refactoring for NamingDirectory integration
Merge pull request #18 from wagnert/master

Refactoring for NamingDirectory integration