Fixed: compile issues on linux
Merge branch 'master' of https://github.com/Andlon/spark