Update quby. Merge flags changes into master