conflict swagolution
Merge branch 'master' of https://github.com/XepherX/SMURT