Thomas G. Lopes
better loading logic
c3571d4