v1.0.1 - Helper function / Minor debug / Code style / Doc