Potential syncing workaround/fix, Pushed separately for focus.
Merge pull request #154 from ThePyrotechnic/Dev

Potential syncing workaround/fix, Pushed separately for focus.