Merge pull request #6 from apache/master

merge upstream changes
Merge branch 'master' of github.com:nchammas/spark
Merge branch 'master' of github.com:nchammas/spark