Merged Alan's project

Added Torch