Merge pull request #3 from tkistner/master

bleh
Merge pull request #4 from tkistner/v1

Merge pull request #3 from tkistner/master