Updated to 1.2.5 (part of #2)