use PROJECT_NAME for imports
no point having two variables serving the same purpose
Merge branch 'release/1.0.1'