Parse links inside a timeout
Merge branch 'develop' into feature/jsonParser