[FIX] Wrong boolean operator (too much Python coding)
[IMP] Merge ditaa improvement fro marcegarba.