Some cleanup
Merge branch 'master' of https://github.com/alex-shpak/xelper.git