cleaning
first update from master in this way of developing