Refactoring and more testing
New version
Some docs