Fix Optimizations
Merge pull request #1 from frap129/master

Fix Optimizations