kripken addition
Merge pull request #10 from kripken/master

kripken addition