Allow configuration via hash as well as attributes
Merge remote-tracking branch 'chewi/master'