first commit from Szabo
Merge branch 'master' of https://github.com/szaboa1/BSG