Merge pull request #1 from torchbox/master

update