Update Dist
Turned off DEBUG flag
Fix merge conflicts from pr/1 crgwbr