Made Import function more robust.
Deployment via Tornado module test.
Merge remote-tracking branch 'remotes/origin/master'