Merge pull request #8 from dbeyer/master

ETAPS program extended