Merge branch '0.3'

Conflicts:
nosqlmap.py