Merge pull request #3 from nbartos/logs

Be more flexible, support new infrastructure.