fix
Merge branch 'master' of github.com:cypro666/capdal-sx