Merge pull request #2 from marcovala/master

[SPARKL-31] & [SPARKL-32]