Fix for #3 - Avoid unused local variables