bugfix and improvement shifts
Merge branch 'master' of https://github.com/LitusProject/Litus