Load subfiles in a more generic manner
merge jpetazzo updates