Tornado working
Merge pull request #1 from mnive93/master

Pull request after tornado integration