Merge amaltaro savannah

Merged in Alan's changes and propagated them to the other python scripts in savannah/