Fixed formatting issues on OS X, and added JavaDoc support.