Feature/c++11

Updates to feature/c++11 branch to use the new line-pos-iterator