Merge pull request #9 from alex-deaconu/master

[feature] Improved service logic & Unit tests