Re: #47: Workflow improvement