Refactored using string::erase
  - A less overbearing for loop, but specific to C++
Merge remote-tracking branch 'origin/master'