Fixed Lag, or at least made it better
Merge pull request #201 from EnacheB/master

Fixed Lag, or at least made it better