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

README.md

@@ -1,6 +1,6 @@
 ![](https://cloud.githubusercontent.com/assets/1467904/19835326/ca62bc36-9ebd-11e6-8b37-7240d76319cd.png)
 
-## [Medoo](http://medoo.in)
+## [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)

src/Medoo.php

@@ -2,7 +2,7 @@
 /*!
  * Medoo database framework
  * https://medoo.in
- * Version 1.4
+ * Version 1.4.1
  *
  * Copyright 2017, Angel Lai
  * Released under the MIT license
@@ -272,7 +272,7 @@ public function query($query, $map = [])
 		return $this->exec($query, $map);
 	}
 
-	public function exec($query, $map)
+	public function exec($query, $map = [])
 	{
 		if ($this->debug_mode)
 		{
@@ -932,6 +932,11 @@ protected function selectContext($table, &$map, $join, &$columns = null, $where
 
 	protected function columnMap($columns, &$stack)
 	{
+		if ($columns === '*')
+		{
+			return $stack;
+		}
+
 		foreach ($columns as $key => $value)
 		{
 			if (is_int($key))