Merge pull request #298 from giuseppebarba/master