Allowed the user to declare their own file extension.
Merge origin/master