Changes made by Hannes Pretorius (hans.pret@gmail.com).