Merge pull request #7 from anharrington/master

all my recent work and setting up source lookup on github
typo noted by Channah