Issue#46 implemented.