1.1: fixed #1 (added full 6.1.2 support)