Merge pull request #17 from simonpasquier/stacklight

Merge master into stacklight