copy-paste merge of #93
Merge branch 'master' of https://github.com/perwendel/spark