Adding support for more file types
Autocommit Tue Nov 18 10:20:40 EST 2014