added init code
Merge branch 'master' of github.com:jensa/cplusplus