Version 0.94b: Aesthetical changes + robustness on sourcing