more enhancements - issue #311
Merge branch 'master' of github.com:sqlmapproject/sqlmap