Merge pull request #5 from xiannox/testing