Fixed docstrings
Removed useless assignment
Merge branch 'development' of https://github.com/cuckoobox/cuckoo into development