Self overflow fix.
Merge branch 'develop' of github.com:dstar4138/distress into develop