Correcting merge #53 - e6c20c5adc63f5434b4915f0bfaf3fddf50cf3b8