cppforlife Merge pull request #5 from ljfranklin/master