cleaning
Merge branch 'xantares-patch-2'