Merge pull request #9 from richardclegg/devel-0.3

Changes for OF 1.0
Add faster retry;2Q