Fix/issues/14