attention same changes
Merge branch 'master' of https://github.com/winemp83/SOL