First commit by Tobias
Merge pull request #11 from twobeers83/master

First commit by Tobias