diff --git a/app.py b/app.py
index d051293..95bde54 100644
--- a/app.py
+++ b/app.py
@@ -7,7 +7,8 @@
 from flask import Flask, request, jsonify
 from inshorts import getNews
 from flask_cors import CORS
-
+env= 1
+# If deploying on cloud server such as heroku use env =0  else use development server ie env = 1
 app = Flask(__name__)
 CORS(app)
 
@@ -19,5 +20,10 @@ def news():
     elif request.method == 'GET':
         return jsonify(getNews(request.args.get('category')))
 
-app.run(debug=True)
-        
\ No newline at end of file
+    
+if (env == 0):
+    port = int(os.environ.get('PORT', 5000))
+    app.run(host='0.0.0.0', port=port)
+else:
+    app.run(debug=True)
+        
diff --git a/inshorts.py b/inshorts.py
index a634426..194f619 100644
--- a/inshorts.py
+++ b/inshorts.py
@@ -7,7 +7,7 @@
 
 import requests
 from bs4 import BeautifulSoup
-
+import os
 
 def getNews(category):
     newsDictionary = {
@@ -17,7 +17,7 @@ def getNews(category):
     }
 
     try:
-        htmlBody = requests.get('https://www.inshorts.com/en/read/' + category)
+        htmlBody = requests.get('https://www.inshorts.com/en/read/' + category, timeout=10)
     except requests.exceptions.RequestException as e:
         newsDictionary['success'] = False
         newsDictionary['errorMessage'] = str(e.message)