Some changes for #6. Deploy on raspberry is ok so far.