Added character and object
Merge branch 'master' of https://github.com/jensa/cplusplus