added build.xml
cleaned up code
updated javadoc
Merge remote-tracking branch 'github/master'