Merge pull request #19 from simonpasquier/stacklight

Merge master into stacklight