Bug fix, doc fix, v1.1