Created by: 183amir
This fixes import issues when it is packaged in conda.
No changes between 183amir-patch-1 and master
