Added JavaDoc

Added JavaDoc + new unit test