fixed problems with ambiguity
Letest updated files. Everything working except trailing semicolon after statement
Merge pull request #3 from jgm55/JoeMaster

Joe master