Merge with master

diff --cc CMakeLists.txt
index cae6bd1398bd06c293966612587cb8bc3b20d76f,e00d1ed284ecdeab62518612785cb104ab4837ca..0c9e75ea7f9033f0e20eafab7667ca3b1ef3af94
--- 1/CMakeLists.txt
--- 2/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -1,7 -1,6 +1,7 @@@
- cmake_minimum_required(VERSION 2.8.11)
 +project(stlink C)
+ cmake_minimum_required(VERSION 2.8.7)
 -project(stlink)
  
 +include(CheckCCompilerFlag)
  find_package(PkgConfig)
  
  pkg_check_modules(libusb REQUIRED libusb-1.0)

diff --cc README
index 1f9d33cdd0c8431ada65ff5c0c751605ab2046f1,986de7002aa90c9a932462c0efb5dd4c8100f9fd..d85fda7eb2e8632e6edb418cf8f0764362e0dc55
--- 1/README
--- 2/README
+++ b/README
@@@ -43,9 -51,18 +51,18 @@@ following steps will build the project 
  $ ./autogen.sh
  $ ./configure
  $ make
 -$ cmake ..
+ ```
+ 
+ ### CMake
+ 
+ ```
+ $ mkdir build && cd build
++$ cmake -DCMAKE_BUILD_TYPE=Debug ..
+ $ make
+ ```
+ 
+ ## Using the gdb server
  
- USING THE GDBSERVER
- ~~~~~~~~~~~~~~~~~~~
  To run the gdb server: (you do not need sudo if you have set up
  permissions correctly)