diff --git a/contributors.txt b/contributors.txt
index 3f7a827154..93810d1f28 100644
--- a/contributors.txt
+++ b/contributors.txt
@@ -102,3 +102,4 @@ YYYY/MM/DD, github id, Full name, email
 2016/08/11, BurtHarris, Ralph "Burt" Harris, Burt_Harris_antlr4@azxs.33mail.com
 2016/08/19, andjo403, Andreas Jonson, andjo403@hotmail.com
 2016/10/21, FloorGoddijn, Floor Goddijn, floor.goddijn[at]aimms.com
+2016/11/01, RYDB3RG, Kai Stammerjohann, RYDB3RG@users.noreply.github.com
diff --git a/runtime/Cpp/runtime/src/ParserRuleContext.cpp b/runtime/Cpp/runtime/src/ParserRuleContext.cpp
index a364ab713d..d78eeae704 100755
--- a/runtime/Cpp/runtime/src/ParserRuleContext.cpp
+++ b/runtime/Cpp/runtime/src/ParserRuleContext.cpp
@@ -50,7 +50,7 @@ ParserRuleContext::ParserRuleContext()
 }
 
 ParserRuleContext::ParserRuleContext(ParserRuleContext *parent, size_t invokingStateNumber)
-: RuleContext(parent, invokingStateNumber) {
+: RuleContext(parent, invokingStateNumber), start(nullptr), stop(nullptr) {
 }
 
 void ParserRuleContext::copyFrom(ParserRuleContext *ctx) {
diff --git a/tool/resources/org/antlr/v4/tool/templates/codegen/Cpp/Cpp.stg b/tool/resources/org/antlr/v4/tool/templates/codegen/Cpp/Cpp.stg
index 4773fe4707..fe3e246f30 100644
--- a/tool/resources/org/antlr/v4/tool/templates/codegen/Cpp/Cpp.stg
+++ b/tool/resources/org/antlr/v4/tool/templates/codegen/Cpp/Cpp.stg
@@ -911,7 +911,7 @@ TokenPropertyRef_index(t) ::= "(<ctx(t)>-><t.label> != nullptr ? <ctx(t)>-><t.la
 TokenPropertyRef_intHeader(t) ::= "<! Required but unused. !>"
 TokenPropertyRef_int(t) ::= "(<ctx(t)>-><t.label> != nullptr ? std::stoi(<ctx(t)>-><t.label>->getText()) : 0)"
 
-RulePropertyRef_stopHeaderHeader(r)  ::= "<! Required but unused. !>"
+RulePropertyRef_startHeader(r)  ::= "<! Required but unused. !>"
 RulePropertyRef_start(r) ::= "(<ctx(r)>-><r.label> != nullptr ? (<ctx(r)>-><r.label>->start) : nullptr)"
 
 RulePropertyRef_stopHeader(r)  ::= "<! Required but unused. !>"