-Resolve Memory Leaks.
-Force local mode
Merge remote-tracking branch 'origin/master'