Added lens type selection, closes #21.