Changes in SeeLibrary, not finished
Merge origin/master