Fixed global variable declaration
Merge with branch 'develop'
Merge branch 'develop'
Fixed minor naming issues
Fixed bug in summary page generation