Issue#23 fixed.