Fixed tab in spaces.
Fixed javadoc and packaging.
Merge remote-tracking branch 'origin/master'