Merge remote-tracking branch 'refs/remotes/origin/develop'

LICENSE.md

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2017 Angel Lai
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -1,26 +1,28 @@
-![](https://cloud.githubusercontent.com/assets/1467904/19835326/ca62bc36-9ebd-11e6-8b37-7240d76319cd.png)
+<p align="center">
+    <a href="https://medoo.in" target="_blank"><img src="https://cloud.githubusercontent.com/assets/1467904/19835326/ca62bc36-9ebd-11e6-8b37-7240d76319cd.png"></a>
+</p>
 
-## [Medoo](https://medoo.in)
-
-[![Total Downloads](https://poser.pugx.org/catfan/medoo/downloads)](https://packagist.org/packages/catfan/medoo)
-[![Latest Stable Version](https://poser.pugx.org/catfan/medoo/v/stable)](https://packagist.org/packages/catfan/medoo)
-[![License](https://poser.pugx.org/catfan/medoo/license)](https://packagist.org/packages/catfan/medoo)
+<p align="center">
+    <a href="https://packagist.org/packages/catfan/medoo"><img alt="Total Downloads" src="https://poser.pugx.org/catfan/medoo/downloads"></a>
+    <a href="https://packagist.org/packages/catfan/medoo"><img alt="Latest Stable Version" src="https://poser.pugx.org/catfan/medoo/v/stable"></a>
+    <a href="https://packagist.org/packages/catfan/medoo"><img alt="License" src="https://poser.pugx.org/catfan/medoo/license"></a>
+</p>
 
 > The Lightest PHP database framework to accelerate development
 
-## Main Features
+## Features
 
-* **Lightweight** - 32KB around with only one file.
+* **Lightweight** - Less than 100 KB, portable with only one file
 
-* **Easy** - Extremely easy to learn and use, friendly construction.
+* **Easy** - Extremely easy to learn and use, friendly construction
 
-* **Powerful** - Supports various common and complex SQL queries, data mapping, and prevent SQL injection.
+* **Powerful** - Supports various common and complex SQL queries, data mapping, and prevent SQL injection
 
-* **Compatible** - Supports all SQL databases, including MySQL, MSSQL, SQLite, MariaDB, Sybase, Oracle, PostgreSQL and more.
+* **Compatible** - Supports all SQL databases, including MySQL, MSSQL, SQLite, MariaDB, PostgreSQL, Sybase, Oracle and more
 
-* **Friendly** - Works well with every PHP frameworks, like Laravel, Codeigniter, Yii, Slim, and framework which supports singleton extension.
+* **Friendly** - Works well with every PHP frameworks, like Laravel, Codeigniter, Yii, Slim, and framework which supports singleton extension or composer
 
-* **Free** - Under MIT license, you can use it anywhere if you want.
+* **Free** - Under MIT license, you can use it anywhere whatever you want
 
 ## Requirement
 

composer.json

@@ -5,6 +5,10 @@
 	"keywords": ["database", "lightweight", "PHP framework", "SQL", "MySQL", "MSSQL", "SQLite", "PostgreSQL", "MariaDB", "Oracle"],
 	"homepage": "https://medoo.in",
 	"license": "MIT",
+	"support": {
+		"issues": "https://github.com/catfan/Medoo/issues",
+		"source": "https://github.com/catfan/Medoo"
+	},
 	"authors": [
 		{"name": "Angel Lai", "email": "angel@catfan.me"}
 	],
@@ -14,7 +18,7 @@
 	},
 	"suggest": {
 		"ext-pdo_mysql": "For MySQL or MariaDB database",
-		"ext-pdo_sqlsrv": "For MSSQL database on Windows platform",
+		"ext-pdo_sqlsrv": "For MSSQL database",
 		"ext-pdo_dblib": "For MSSQL or Sybase database on Linux/UNIX platform",
 		"ext-pdo_oci": "For Oracle database",
 		"ext-pdo_oci8": "For Oracle version 8 database",