testing

Merge pull request #18 from colincoghill/master