Committing the original v0.24 by the original author, xeno010.