Merge pull request #5 from jgoley/jonathan

Fixes selection of type based on user selection