Some littel changes
#
Fixing of a conflickt