Feature/multiple projects fix

Fixes issue #34