Merge pull request #28 from VetSec/master