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

Library updates