Merged 'wojtek' manually