diff --git a/jrnl/cli.py b/jrnl/cli.py
index b65c24d2..df0ac1ad 100644
--- a/jrnl/cli.py
+++ b/jrnl/cli.py
@@ -24,6 +24,8 @@ def parse_args(args=None):
     parser = argparse.ArgumentParser()
     parser.add_argument('-v', '--version', dest='version', action="store_true", help="prints version information and exits")
     parser.add_argument('-ls', dest='ls', action="store_true", help="displays accessible journals")
+    # yarko test:
+    parser.add_argument('-c', '--config', dest='conf', action="store_true", help="shows current config file and path")
 
     composing = parser.add_argument_group('Composing', 'To write an entry simply write it on the command line, e.g. "jrnl yesterday at 1pm: Went to the gym."')
     composing.add_argument('text', metavar='', nargs="*")
@@ -127,6 +129,10 @@ def run(manual_args=None):
         print(util.py2encode(version_str))
         sys.exit(0)
 
+    if args.conf:
+        install.show_config()
+        sys.exit(0)
+
     config = install.install_jrnl()
 
     if args.ls:
diff --git a/jrnl/install.py b/jrnl/install.py
index 5e643935..1eeeecfa 100644
--- a/jrnl/install.py
+++ b/jrnl/install.py
@@ -6,6 +6,7 @@ import readline
 import glob
 import getpass
 import os
+import sys
 import xdg.BaseDirectory
 from . import util
 import yaml
@@ -59,6 +60,11 @@ def upgrade_config(config):
         save_config(config)
         print("[.jrnl_conf updated to newest version]")
 
+def show_config():
+    with open(CONFIG_FILE_PATH) as f:
+        print "# ", CONFIG_FILE_PATH
+        sys.stdout.write(f.read())
+
 
 def save_config(config):
     with open(CONFIG_FILE_PATH, 'w') as f: