Added sample lib
Fixed merge