update
Merge branch 'master' of https://github.com/pepi55/SotS
merging
final release