Merge Maciej's fork