Better autoshifting logic
changes before TRI
Merge pull request #7 from LoadingPleaseWait/lpw

before TRI