Merge pull request #12 from simonpasquier/stacklight

Merge master into stacklight