Issues/14

fix issue #14