WIP relook
Merge pull request #12 from spg/relook

WIP relook