FROM and FROM_NAME settings added
JAVA wrapper
Merge remote-tracking branch 'upstream/master'