LESS: Used basepath for more robust solution.
Merge pull request #347 from am11/master

LESS: Used basepath for more robust solution