implemento log
Merge branch 'feature_log' into develop