fixed infrastructure adding
Merge pull request #10 from mpaciore/cleanup_and_fixes

fixed infrastructure adding