Merge tag 'spark_4' into compile-server2

Tag version 0.2.1 as spark_4
Merge branch 'master' into compile-server2