Merge pull request #31 from afontaine/javadoc

Code Documentation
Fixed some quick bugs
Merge remote-tracking branch 'origin/master'