First commit.
Merge https://github.com/Grimelios/Cronus