Merge pull request #50 from Doha2012/master

Change input file extension
Merge remote-tracking branch 'upstream/master'