#44: updated javadocs
#65: updated readme
#65: updated readme
fixing merge conflicts