Some improvements for extension
Merge branch 'develop' of https://github.com/hostilefork/rencpp into develop