Merge branch 'grtfou-master'
update output of abstract_factory.py