Yzl/issue 19

Fixes #19. 

@sethvargo