Changin a bit the documentation and adding test