Merged dockerfile with entrypoint, updated readme