Optimization, memory leak fixes, bug fixes, simulation rework, etc.
Merge remote-tracking branch 'origin/master'