Updated for 1.3.0, fixed #2