added test; tested with unit; working good?
removed comments;