V0.10 development loader fix

Hi,

This solves all the problems in #42 and some more.

Please review and merge, thanks!