Commit from the past 2 times
Merge branch 'master' of https://github.com/pyrogoggles/CPlusPlusT