Version 1.0.1 / Minor improvements