new artemis branch
Merge pull request #2 from peteflorence/artemis

new artemis branch