Merge pull request #33 from addisonbgross/master

Testing merge