Minor changes: use linear kernel function
Merge branch 'feature_kernel_type' into develop
Merge branch 'develop'