Few last minute fixes

Few last minute fixes

issue #32