Address issue #4, thanks @MattBrauer