diff --git a/python/calculator.py b/python/calculator.py
index ce08384d..1fcf538f 100644
--- a/python/calculator.py
+++ b/python/calculator.py
@@ -1,18 +1,22 @@
 """Simple calculator app"""
 
+import math
 
 def main():
     while True:
         try:
             string = input("> ")
-            print(eval(string))
+            parts = string.split(" ")
+            if len(parts) == 3 and parts[0] == "log":
+                print(math.log(int(parts[2]), int(parts[1])))
+            else:
+                print(eval(string))
         except (KeyboardInterrupt, EOFError):
             print()
             exit()
-        except (BaseException, KeyboardInterrupt) as e:
+        except Exception as e:
             print(e)
 
-
 if __name__ == "__main__":
     print("Welcome to calculator!")
     main()