Small fixes
Merge pull request #1 from PerilousApricot/marco_condor

Small fixes