Merge pull request #154 from sigmaSd/infer