Implemented Issue#26