Merge pull request #23 from dumganhar/master

Native return type fix
minor update to the debugger
Merge branch 'master' of github.com:funkaster/cxx-generator
Merge pull request #1 from funkaster/master

Updated with upstream.