If a file extension is specified in a  it is kept. Closes #1
Merge remote-tracking branch 'basicallydan/master'