fix issue #8 #12

Closed joan-carbassa-ithinkupc closed 5 months ago