Merge pull request #1 from KEA-BEIT/master

sync
fixed some exits exceptions
Merge pull request #2 from KEA-BEIT/Services

Services