diff --git a/bin/lumen-petstore-server.sh b/bin/lumen-petstore-server.sh
old mode 100644
new mode 100755
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PythonClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PythonClientCodegen.java
index d560a946214..a1e3d6f9356 100755
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PythonClientCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PythonClientCodegen.java
@@ -69,6 +69,8 @@ public class PythonClientCodegen extends DefaultCodegen implements CodegenConfig
                     // local variable name used in API methods (endpoints)
                     "all_params", "resource_path", "path_params", "query_params",
                     "header_params", "form_params", "local_var_files", "body_params",  "auth_settings",
+                    // @property
+                    "property",
                     // python reserved words
                     "and", "del", "from", "not", "while", "as", "elif", "global", "or", "with",
                     "assert", "else", "if", "pass", "yield", "break", "except", "import",
diff --git a/modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml b/modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
index bf84cf9c38c..01c0be8c9a3 100644
--- a/modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
+++ b/modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
@@ -717,6 +717,8 @@ definitions:
         readOnly: true
         type: integer
         format: int32
+      property:
+        type: string
     xml:
       name: Name
   200_response:
diff --git a/samples/client/petstore/python/README.md b/samples/client/petstore/python/README.md
index 309ae5d6374..79eef580326 100644
--- a/samples/client/petstore/python/README.md
+++ b/samples/client/petstore/python/README.md
@@ -5,7 +5,7 @@ This Python package is automatically generated by the [Swagger Codegen](https://
 
 - API version: 1.0.0
 - Package version: 1.0.0
-- Build date: 2016-04-19T21:05:59.494+01:00
+- Build date: 2016-04-20T22:11:45.927+08:00
 - Build package: class io.swagger.codegen.languages.PythonClientCodegen
 
 ## Requirements.
diff --git a/samples/client/petstore/python/docs/Name.md b/samples/client/petstore/python/docs/Name.md
index 905680a7d30..a472a529a0f 100644
--- a/samples/client/petstore/python/docs/Name.md
+++ b/samples/client/petstore/python/docs/Name.md
@@ -5,6 +5,7 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **name** | **int** |  | 
 **snake_case** | **int** |  | [optional] 
+**_property** | **str** |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/samples/client/petstore/python/swagger_client/models/name.py b/samples/client/petstore/python/swagger_client/models/name.py
index 068bca97eea..4fbf1a03211 100644
--- a/samples/client/petstore/python/swagger_client/models/name.py
+++ b/samples/client/petstore/python/swagger_client/models/name.py
@@ -38,16 +38,19 @@ class Name(object):
         """
         self.swagger_types = {
             'name': 'int',
-            'snake_case': 'int'
+            'snake_case': 'int',
+            '_property': 'str'
         }
 
         self.attribute_map = {
             'name': 'name',
-            'snake_case': 'snake_case'
+            'snake_case': 'snake_case',
+            '_property': 'property'
         }
 
         self._name = None
         self._snake_case = None
+        self.__property = None
 
     @property
     def name(self):
@@ -93,6 +96,28 @@ class Name(object):
         """
         self._snake_case = snake_case
 
+    @property
+    def _property(self):
+        """
+        Gets the _property of this Name.
+
+
+        :return: The _property of this Name.
+        :rtype: str
+        """
+        return self.__property
+
+    @_property.setter
+    def _property(self, _property):
+        """
+        Sets the _property of this Name.
+
+
+        :param _property: The _property of this Name.
+        :type: str
+        """
+        self.__property = _property
+
     def to_dict(self):
         """
         Returns the model properties as a dict