Merge pull request #6 from als753/master

Amanda - adding type inference code
Merge remote-tracking branch 'tobyclemson/master'