Update to SF 4.1; Fix Javadocs