Merge branch 'issue127' into release-1.0
Merge branch 'changeCombatSecondsDecimal' into release-1.0
Fixing issue #128
Merge branch 'issue128' into develop