Small improvements in javadoc (+ encoding)
Merge pull request #40 from mukoki/master

feaw improvments in javadoc and encoding
Merge with the last @mukoki pr