Adds more configration options, closes #34