Merge pull request #4 from simonpasquier/stacklight

Merge master into stacklight