Update user agent detection
Merge branch 'develop'