fixes after merge

related to issue #4

fixed by @maitegm