fixing bad merge
Merge pull request #18 from seanbiefeld/master

fixing bad merge