Updated and fixed configure
Merge pull request #1 from lasote/master

Updated and fixed to 2.0