Merge pull request #2 from blacktail/test

Test