Coffee free

Fix for #75