BugFix
BugFix
Merge pull request #152 from marcoNieddu/master

BugFix
Merge remote-tracking branch 'upstream/master'