diff --git a/sol/function.hpp b/sol/function.hpp
index 264fc0e9..c6f47d89 100644
--- a/sol/function.hpp
+++ b/sol/function.hpp
@@ -61,6 +61,16 @@ public:
     function(const function&) = default;
     function& operator=(const function&) = default;
 
+    template<typename... Args>
+    void operator()( Args&&... args ) {
+	    call<>(std::forward<Args>(args)... );
+    }
+
+    template<typename... Ret, typename... Args>
+    auto operator()( types<Ret...>, Args&&... args ) {
+	    return call<Ret...>(std::forward<Args>(args)... );
+    }
+    
     template<typename... Ret, typename... Args>
     auto call(Args&&... args) -> decltype(invoke(types<Ret...>(), sizeof...(Args))) {
         push();
diff --git a/sol/table.hpp b/sol/table.hpp
index 4a444e52..d3de9c48 100644
--- a/sol/table.hpp
+++ b/sol/table.hpp
@@ -82,13 +82,13 @@ public:
     }
 
     template<typename T>
-    auto operator[](T&& key) -> decltype(proxy<decltype(*this), T>(*this, std::forward<T>(key))) {
-        return proxy<decltype(*this), T>(*this, std::forward<T>(key));
+    proxy<table, T> operator[](T&& key) {
+        return proxy<table, T>(*this, std::forward<T>(key));
     }
 
     template<typename T>
-    auto operator[](T&& key) const -> decltype(proxy<decltype(*this), T>(*this, std::forward<T>(key))) {
-        return proxy<decltype(*this), T>(*this, std::forward<T>(key));
+    proxy<const table, T> operator[](T&& key) const {
+        return proxy<const table, T>(*this, std::forward<T>(key));
     }
 
     size_t size() const {
diff --git a/tests.cpp b/tests.cpp
index a24e92a4..6e7fdc6e 100644
--- a/tests.cpp
+++ b/tests.cpp
@@ -120,6 +120,7 @@ TEST_CASE("advanced/callLambdaReturns", "Checks for lambdas returning values") {
     lua.set_function("g", [ ] { return std::string("str"); });
     lua.set_function("h", [ ] { });
     lua.set_function("i", [ ] { return sol::nil; });
+    //lua.set_function("i", [ ] { return std::make_tuple(1, 6.28f, 3.14, std::string("heh")); });
 }
 
 TEST_CASE("advanced/callLambda2", "A C++ lambda is exposed to lua and called") {