diff --git a/build_linux64/libamsstring4.linux64.a b/build_linux64/libamsstring4.linux64.a
index c53b272..69c0d2b 100644
Binary files a/build_linux64/libamsstring4.linux64.a and b/build_linux64/libamsstring4.linux64.a differ
diff --git a/build_linux64/objstore/amsstring4_bintextencoding.o b/build_linux64/objstore/amsstring4_bintextencoding.o
index 3aeca77..e27774c 100644
Binary files a/build_linux64/objstore/amsstring4_bintextencoding.o and b/build_linux64/objstore/amsstring4_bintextencoding.o differ
diff --git a/build_linux64/objstore/amsstring4_class.o b/build_linux64/objstore/amsstring4_class.o
index ae27560..67e18d3 100644
Binary files a/build_linux64/objstore/amsstring4_class.o and b/build_linux64/objstore/amsstring4_class.o differ
diff --git a/build_linux64/objstore/amsstring4_unicode.o b/build_linux64/objstore/amsstring4_unicode.o
index a700e74..52f47f6 100644
Binary files a/build_linux64/objstore/amsstring4_unicode.o and b/build_linux64/objstore/amsstring4_unicode.o differ
diff --git a/build_linux64/tests b/build_linux64/tests
index a8c60df..84a3825 100644
Binary files a/build_linux64/tests and b/build_linux64/tests differ
diff --git a/include/amsstring4/amsstring4.hpp b/include/amsstring4/amsstring4.hpp
index 40ac67b..edec76c 100644
--- a/include/amsstring4/amsstring4.hpp
+++ b/include/amsstring4/amsstring4.hpp
@@ -93,6 +93,7 @@ public:
     void remove(const int ind);
     void remove(const int ind1, const int ind2);
     void substring(const int ind1, const int ind2, amsstring *sout) const;
+    amsstring substring(const int ind1, const int ind2) const;
 
     //Append
     void append(const amsstring &other);
diff --git a/src/amsstring4/amsstring4_class.cpp b/src/amsstring4/amsstring4_class.cpp
index 087e128..e58fc01 100644
--- a/src/amsstring4/amsstring4_class.cpp
+++ b/src/amsstring4/amsstring4_class.cpp
@@ -653,6 +653,13 @@ namespace ams
     
       return;
     }
+
+    amsstring amsstring::substring(const int ind1, const int ind2) const
+    {
+      amsstring ret;
+      this->substring(ind1,ind2,&ret);
+      return ret;
+    }
     
     void amsstring::append(const amsstring &other)
     {
diff --git a/src/amsstring4/amsstring4_portability.cpp b/src/amsstring4/amsstring4_portability.cpp
index d19a58d..5d69d2e 100644
--- a/src/amsstring4/amsstring4_portability.cpp
+++ b/src/amsstring4/amsstring4_portability.cpp
@@ -140,7 +140,7 @@ int amssprintf_s(char *s, int n, const char *format, ...)
   //va_arg(val,datatype)
   // if(s!=NULL)
   // {
-    #if defined(LINUX) || defined(linux) || defined(__linux__) || defined(__GNUC__)
+    #if defined(LINUX) || defined(linux) || defined(__linux__) || defined(__GNUC__) || defined(__APPLE__) || defined(__MACH__)
         //use snprintf
         ret = (int)vsnprintf(s,n,format,args);
         s[n-1] = '\0';