Merge commit from develop

Directory.h

@@ -3,6 +3,7 @@
 
 # include "includes"
 # include "DirectoryEntry.h"
+# include "Log.h"
 
 namespace coreutils {
 
@@ -29,7 +30,7 @@ namespace coreutils {
       }
 
       DirectoryEntry get() {
-         if(cursor == directory.end())
+         if(eod())
            return NULL;
          return cursor->second;
       }