2011.12.07
Merge https://github.com/Francis-Underwood/eDirectory