Merge pull request #39 from dmb2168/master

Bringing chris_kira_SA up to date with master
Merge pull request #40 from dmb2168/chris_kira_semantic_analysis

final merge to master