BRANCH SP-1265:
   resolved conflicts
Merge pull request #88 from Southpaw-TACTIC/SP-1265

BRANCH SP-1265: