Merge pull request #12 from dkorolev/RetryPolicy

Minor tweaks & clang++ support & fixes.