diff --git a/sol/demangle.hpp b/sol/demangle.hpp
new file mode 100644
index 00000000..9328673b
--- /dev/null
+++ b/sol/demangle.hpp
@@ -0,0 +1,68 @@
+// The MIT License (MIT)
+
+// Copyright (c) 2013 Danny Y., Rapptz
+
+// 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.
+
+#ifndef SOL_DEMANGLE_HPP
+#define SOL_DEMANGLE_HPP
+
+#include <string>
+
+#ifdef _MSC_VER
+#include <windows.h>
+#include <DbgHelp.h>
+
+namespace sol {
+namespace detail {
+
+
+	std::string demangle(const std::type_info& id) {
+		std::string realname(2048, '\0');
+		DWORD result = UnDecorateSymbolName(id.raw_name(), realname.data(), realname.size(), UNDNAME_32_BIT_DECODE);
+		if (result == 0)
+			return "";
+		realname.resize(result);
+		return realname;
+	}
+
+#elif __GNUC__ || __clang__
+#include <cxxabi.h>
+
+namespace sol {
+namespace detail {
+
+	std::string demangle(const std::type_info& id) {
+		int status;
+		char* unmangled = abi::__cxa_demangle(id.name(), 0, 0, &status);
+		std::string realname = unmangled;
+		free(unmangled);
+		return realname;
+	}
+
+#else
+namespace sol {
+namespace detail {
+
+#error Implement demangling for this platform
+#endif // VC++ || GCC || Others
+
+} // detail
+} // sol
+
+#endif // SOL_DEMANGLE_HPP
\ No newline at end of file
diff --git a/sol/deprecate.hpp b/sol/deprecate.hpp
new file mode 100644
index 00000000..bd14b5c1
--- /dev/null
+++ b/sol/deprecate.hpp
@@ -0,0 +1,35 @@
+// The MIT License (MIT)
+
+// Copyright (c) 2013 Danny Y., Rapptz
+
+// 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.
+
+#ifndef SOL_DEPRECATE_HPP
+#define SOL_DEPRECATE_HPP
+
+#ifndef DEPRECATE
+#ifdef _MSC_VER
+#define DEPRECATE __declspec(deprecated)
+#elif __GNUC__
+#define DEPRECATE __attribute__((deprecated)) 
+#else
+#define DEPRECATE [[deprecated]]
+#endif // VC++ || GCC || Others
+#endif // DEPRECATE
+
+#endif // SOL_DEPRECATE_HPP
\ No newline at end of file
diff --git a/sol/lua_function.hpp b/sol/lua_function.hpp
index a294db0c..5110e0e3 100644
--- a/sol/lua_function.hpp
+++ b/sol/lua_function.hpp
@@ -97,12 +97,12 @@ struct static_lua_func {
 
 template<typename T, typename TFx>
 struct static_object_lua_func {
-    typedef typename std::decay<TFx>::type fx_t;
+    typedef typename std::remove_pointer<typename std::decay<TFx>::type>::type fx_t;
     typedef function_traits<fx_t> fx_traits;
 
     template<typename... Args>
     static int typed_call(types<void>, types<Args...>, T& item, fx_t& ifx, lua_State* L) {
-        auto fx = [&item, &ifx](Args&&... args) { (item.*ifx)(std::forward<Args>(args)...); };
+        auto fx = [&item, &ifx](Args&&... args) -> void { (item.*ifx)(std::forward<Args>(args)...); };
         stack::pop_call(L, fx, types<Args...>());
         return 0;
     }