updated support lib
Merge commit 'b7dca53'