Revert "Merge latest from spark:master"
Merge pull request #3 from lono-devices/revert-2-master

Revert "Merge latest from spark:master"