add link to metacoder
add timeout and url formating
solve conflict
Merge pull request #2 from RixTox/master

client updates