updated version of sw
yMerge branch 'master' of https://github.com/matteoredaelli/cjbot