Corrected bug with adding directory; Forgotten files from previous commit...