resolve data before showing the page
Merge pull request #28 from nmorel/resolve

resolve data before showing the page