Merge pull request #4 from graimundo/master

[SERVDEV-22] / [SERVDEV-26] / [SPARKL-30]