Merge branch 'master' into patch-1

diff --cc src/file.cpp
index 5dbfa1b,56de1c2..bead63b
--- 1/src/file.cpp
--- 2/src/file.cpp
+++ b/src/file.cpp
@@@ -35,11 -35,11 +35,11 @@@
  #include "universalhdr.h"
  #include "unzip.h"
  #include "zlib.h"
- #include "libelf\libelf.h"
- #include "libelf\gelf.h"
+ #include "libelf/libelf.h"
+ #include "libelf/gelf.h"
  #include "libdwarf.h"
 -#include "Debugger/ELFManager.h"
 -#include "debugger/DBGManager.h"
 +#include "debugger\ELFManager.h"
 +#include "debugger\DBGManager.h"
  
  
  // Private function prototypes