Push for 1.4.5, fixes #6 & fixes #7