Add a binary
Use Addressable gem if it's available
Better error messages
Better error messages