Merge pull request #1 from sqlmapproject/master