Version 1.0.1

Just code simplification, no visible changes.