Converted the generic urls to class-based urls
Version bump: 1.1.1
Merge branch '1.1.1'