added to JavaDoc comments
using inner class for static lookup tables, added javadoc comments
update javadoc comments
fixing rebase error
fixing divergent branches