Library updates
Merge pull request #25 from piotrglazar/wip/library-updates

Library updates