initial commit
Merge pull request #1 from twerner1993/dev

initial commit
Merge pull request #2 from twerner1993/test

Test