Merge pull request #228 from mikewalch/spark-opt