Merge pull request #1 from DITgroup2/master

main project pull - Peter