starting #9
fixes #9
Merge pull request #10 from saml/robot

Robot
Merge branch 'qa'