Initial implem variable definition
Merge / merge fixes
Merge / merge fixes
Merge remote-tracking branch 'origin/master'