Merge issue #45 con master

Close #45