Merged changes from @lukasa