Version 1.0.2

Just code simplification, no major changes