Merge pull request #8 from eucalyptus/testing

Testing update