Updates classpaths after #389
Merge pull request #398 from huitseeker/classpaths-update

Updates classpaths after #389