Merge pull request #5 from marcovala/master

[SPARKL-31]