Merge pull request #27 from outbounder/master

Various improvements