Merge pull request #6 from graimundo/master

[SERVDEV-22] / [SERVDEV-28]