Fix Crashes on Refresh. Remove Complexity in refresh.
Merge pull request #4 from jules2689/make-less-complex-refresh

Make less complex refresh