Issue 4: Fixes install location
Issue 4: Fixes install location
Merge branch 'Issue4'