Merge pull request #3 from m-schrepel/master

Got time shifting working