Fix for long loading because of pictures
Merge pull request #30 from soyuka/develop

Fix for long loading because of pictures