display done before any message display
variables inverted
test moved
Merge branch 'code-reorganisation'
README updated