Added more options. Pre-merged #31.