Some changes and add Guardfile