Merge pull request #29 from obourdon/stacklight

Fixes for idempotence