beautify analyze.py
Merge branch 'master' of https://github.com/fding/llama
merge, fixes for analyze