Upgraded support lib
Merge pull request #2 from ijansch/master

Upgraded support lib