Improve extension handling

Created by  Nathan Jaremko  on March 2, 2019
OVAVVFAN3HJONG2FNLYH6JLDYNFA3RHKVSPUICJXPPKNSKIEH3MQC
Change contents