Improved refresh
Merge pull request #32 from astagi/master

Improved refresh