Merge pull request #3 from swarage/master

small changes
Merge pull request #4 from swarage/shifter_test

Shifter test
main changed?