solve conflicts
Merge branch 'MrSATA-master'