Added my work
Everyting fetched and put into my fork
Merge pull request #25 from ZackMullaly/master

ZackMullaly