Some fixes

issue #23
issue #25