initial commit
Merge https://github.com/imdragonet/tidee