finish
Merge pull request #231 in YIN/basic from feature/YCB-150 to develop

* commit '7fc6f922abf04349a42a19b72747a5da0f5a1951':
  finish