v0.6 to v0.7 spotlight core
Merge pull request #13 from sandroacoelho/v0.7

v0.6 to v0.7 spotlight core