Merge #200 fix,remove Tardis class,version update