Merge pull request #4 from MC3D/development

Development
Fixes selection of type based on user selection
Merge pull request #5 from jgoley/jonathan

Fixes selection of type based on user selection
adds selection type based on user selection