Some improvement

Merge timmyArch:master with koter84:master