Merge pull request #159 from goranche/master

manually merged sparkica-fea_ambassador