Update support lib
Merge pull request #1 from okaymak/master

Update support lib