added nice error return and some examples in readme
Merge remote-tracking branch 'origin/master'