Merge pull request #12 from wagnert/master

Switch to new NamingDirectory integeration