Add code for library
Add more code, tests
Merge remote-tracking branch 'origin/master'