Gapdate 18

various
Merge branch 'master' of https://github.com/syntagm/xmspot2