Merge issue 44 con master

close #44