Merge pull request #16 from elemoine/stacklight-sync-master

Sync stacklight branch from master