Another update for an Issue #352
Merge branch 'master' of github.com:sqlmapproject/sqlmap
Another update for an Issue #352 and couple of fixes