diff --git a/wrap/Argument.cpp b/wrap/Argument.cpp
index fb3d962ed..d76556e4a 100644
--- a/wrap/Argument.cpp
+++ b/wrap/Argument.cpp
@@ -44,6 +44,12 @@ string Argument::matlabClass(const string& delim) const {
   return result + type;
 }
 
+/* ************************************************************************* */
+bool Argument::isScalar() const {
+  return (type == "bool" || type == "char" || type == "unsigned char"
+      || type == "int" || type == "size_t" || type == "double");
+}
+
 /* ************************************************************************* */
 void Argument::matlab_unwrap(FileWriter& file, const string& matlabName) const {
   file.oss << "  ";
@@ -127,6 +133,13 @@ string ArgumentList::names() const {
   return str;
 }
 
+/* ************************************************************************* */
+bool ArgumentList::allScalar() const {
+  BOOST_FOREACH(Argument arg, *this)
+      if (!arg.isScalar()) return false;
+  return true;
+}
+
 /* ************************************************************************* */
 void ArgumentList::matlab_unwrap(FileWriter& file, int start) const {
   int index = start;
diff --git a/wrap/Argument.h b/wrap/Argument.h
index 9d57f2853..6f791978a 100644
--- a/wrap/Argument.h
+++ b/wrap/Argument.h
@@ -41,6 +41,9 @@ struct Argument {
   /// return MATLAB class for use in isa(x,class)
   std::string matlabClass(const std::string& delim = "") const;
 
+  /// Check if will be unwrapped using scalar login in wrap/matlab.h
+  bool isScalar() const;
+
   /// adds namespaces to type
   std::string qualifiedType(const std::string& delim = "") const;
 
@@ -60,6 +63,9 @@ struct ArgumentList: public std::vector<Argument> {
   /// create a comma-separated string listing all argument names, used in m-files
   std::string names() const;
 
+  /// Check if all arguments scalar
+  bool allScalar() const;
+
   // MATLAB code generation:
 
   /**