Improved documentation
Adding test