Merge pull request #3 from emchristiansen/master

stuff
intro and related works