Merge pull request #10 from aratana/master

Merge branch 'develop'