Library updates
Merge pull request #36 from piotrglazar/feature/library-updates

Library updates