Xmas changes
Merge https://github.com/guilhermecaldas/chemis-online