Added in a separate PR, #34 

I'll wait till that's merged and then change that here.