RT88135 and RT89491 fixes
Merge branch 'pr/8'

Fixes #8