Updated to 1.6.1

Still works on 1.5.2