diff --git a/.gitignore b/.gitignore
index daa27c854..b94998932 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,9 +4,12 @@ build
 dist
 __pycache__
 .coverage
+.ropeproject
+.idea/*
+.DS_Store
 nosetests.xml
 _build
-.ropeproject
 tools/virtualenvs
 build.log
-.idea/*
+_/
+_WORKSPACE/
diff --git a/behave/main.py b/behave/main.py
index 65b78e9f6..e2a5c6df1 100644
--- a/behave/main.py
+++ b/behave/main.py
@@ -6,6 +6,7 @@
 from behave.formatter import formatters
 from behave.runner import Runner
 from behave.parser import ParserError
+from behave.version import VERSION
 
 TAG_HELP = """
 Scenarios inherit tags declared on the Feature level. The simplest
@@ -51,6 +52,9 @@ def main():
     if config.tags_help:
         print TAG_HELP
         sys.exit(0)
+    if config.version:
+        print VERSION
+        sys.exit(0)
 
     if config.lang_list:
         iso_codes = languages.keys()
@@ -78,13 +82,12 @@ def main():
 
     if not config.format:
         config.format = ['pretty']
-    elif config.format == ['help']:
+    elif "help" in config.format:
         print "Available formatters:"
         formatters.list_formatters(sys.stdout)
         sys.exit(0)
 
     stream = config.output
-
     runner = Runner(config)
     try:
         failed = runner.run()
diff --git a/behave/version.py b/behave/version.py
new file mode 100644
index 000000000..78ee56bff
--- /dev/null
+++ b/behave/version.py
@@ -0,0 +1 @@
+VERSION = "1.2.0-JE"
diff --git a/setup.py b/setup.py
index 38604afeb..67117cb1e 100644
--- a/setup.py
+++ b/setup.py
@@ -3,6 +3,7 @@
 import sys
 
 from setuptools import find_packages, setup
+from behave.version import VERSION
 
 requirements = ['parse>=1.3.3']
 major, minor = sys.version_info[:2]
@@ -15,10 +16,10 @@
 
 setup(
     name='behave',
-    version='1.2.0',
+    version=VERSION,
     description='behave is behaviour-driven development, Python style',
     long_description=description,
-    author='Benno Rice and Richard Jones',
+    author='Benno Rice and Richard Jones, patched by JE',
     author_email='behave-users@googlegroups.com',
     url='http://github.com/jeamland/behave',
     packages=find_packages(),