Merge pull request #12 from JensTimmerman/master

fixed some annoyances
Merge pull request #13 from JensTimmerman/master

don't try to use agent when you don't need to.