Merge pull request #38 from simonpasquier/stacklight

Merge master into stacklight