Updated libraries
Simplify method
Rewrite
Update readme