Fix loadpath issues.
Merge pull request #36 from nanliu/loadpath

Fix loadpath issues.