OSNG-7 - Added testcases, added spring bean injection, added error handling
Merge remote-tracking branch 'origin/master'