refactor Dockerfile
readme fix
merge