JavaDoc added, Exception added #78