General improvements

Plus test case/example
General improvements