Final commit for esktera 1.0.0