Not merging this in

Reason: https://github.com/kid0m4n/rays/commit/d2e03a38c739006398ee0d6eef75bf10e25000ce