Merge #200 fix,remove Tardis class,version update
Merge pull request #201 from ping19/master

Merge #200 fix,remove Tardis class,version update