soumith Merge pull request #17 from lanpa/master