CHanges from electra.
Merge branch 'master' of https://github.com/djvine/sxm_manager
Merge branch 'master' of https://github.com/djvine/sxm_manager
Working version from 2ide