Changes from python-pele:master 03/12/14