Merge pull request #8 from graimundo/master

[SPARKL-36]