Better content loading
Merge branch 'pr-17'