fix/merged issue #149