Merge pull request #6 from simonpasquier/stacklight

Minor fixes