rename baseURL
Adding javadoc and renamed parameters
Merge branch 'pr/150'