Issue#23 fix.
Issue#26 fix.