diff --git a/binary_archive/array.hpp b/binary_archive/array.hpp
index 11d18847..06befa56 100644
--- a/binary_archive/array.hpp
+++ b/binary_archive/array.hpp
@@ -7,7 +7,7 @@
 namespace cereal
 {
   //! Saving for std::array primitive types to binary
-  template <class T, size_t N>
+  template <class T, size_t N> inline
   typename std::enable_if<std::is_arithmetic<T>::value, void>::type
   save( BinaryOutputArchive & ar, std::array<T, N> const & array )
   {
@@ -15,7 +15,7 @@ namespace cereal
   }
 
   //! Loading for std::array primitive types to binary
-  template <class T, size_t N>
+  template <class T, size_t N> inline
   typename std::enable_if<std::is_arithmetic<T>::value, void>::type
   load( BinaryInputArchive & ar, std::array<T, N> & array )
   {
@@ -23,7 +23,7 @@ namespace cereal
   }
 
   //! Saving for std::array all other types to binary
-  template <class T, size_t N>
+  template <class T, size_t N> inline
   typename std::enable_if<!std::is_arithmetic<T>::value, void>::type
   save( BinaryOutputArchive & ar, std::array<T, N> const & array )
   {
@@ -32,7 +32,7 @@ namespace cereal
   }
 
   //! Loading for std::array all other types to binary
-  template <class T, size_t N>
+  template <class T, size_t N> inline
   typename std::enable_if<!std::is_arithmetic<T>::value, void>::type
   load( BinaryInputArchive & ar, std::array<T, N> & array )
   {
diff --git a/binary_archive/bitset.hpp b/binary_archive/bitset.hpp
index 972ce9b1..42a68e25 100644
--- a/binary_archive/bitset.hpp
+++ b/binary_archive/bitset.hpp
@@ -11,11 +11,17 @@ namespace cereal
     enum class type : uint8_t
     {
       ulong,
-      uulong,
+      ullong,
       string
     };
 
-  };
+    template <class Archive> inline
+    CEREAL_ARCHIVE_RESTRICT_SERIALIZE(BinaryInputArchive, BinaryOutputArchive)
+    serialize( Archive & ar, type & t )
+    {
+      ar & reinterpret_cast<uint8_t &>( t );
+    }
+  }
 
   //! Serializing (save) for std::bitset to binary
   template <size_t N> inline
@@ -31,8 +37,8 @@ namespace cereal
     {
       try
       {
-        auto const b = bits.to_uulong();
-        ar & bitset_detail::type::uulong;
+        auto const b = bits.to_ullong();
+        ar & bitset_detail::type::ullong;
         ar & b;
       }
       catch( std::overflow_error const & e )
@@ -59,7 +65,7 @@ namespace cereal
         bits = std::bitset<N>( b );
         break;
       }
-      case bitset_detail::type::uulong:
+      case bitset_detail::type::ullong:
       {
         unsigned long long b;
         ar & b;
diff --git a/binary_archive/deque.hpp b/binary_archive/deque.hpp
index 10d1216e..f1c35cb5 100644
--- a/binary_archive/deque.hpp
+++ b/binary_archive/deque.hpp
@@ -7,7 +7,7 @@
 namespace cereal
 {
   //! Saving for std::deque to binary
-  template <class T, class A>
+  template <class T, class A> inline
   void save( BinaryOutputArchive & ar, std::deque<T, A> const & deque )
   {
     ar & deque.size();
@@ -17,7 +17,7 @@ namespace cereal
   }
 
   //! Loading for std::deque to binary
-  template <class T, class A>
+  template <class T, class A> inline
   void load( BinaryInputArchive & ar, std::deque<T, A> & deque )
   {
     size_t size;
diff --git a/binary_archive/forward_list.hpp b/binary_archive/forward_list.hpp
index b71786ad..efa15afa 100644
--- a/binary_archive/forward_list.hpp
+++ b/binary_archive/forward_list.hpp
@@ -7,7 +7,7 @@
 namespace cereal
 {
   //! Saving for std::forward_list all other types to binary
-  template <class T, class A>
+  template <class T, class A> inline
   void save( BinaryOutputArchive & ar, std::forward_list<T, A> const & forward_list )
   {
     // save position for size of list
@@ -28,7 +28,7 @@ namespace cereal
   }
 
   //! Saving for std::forward_list all other types to binary (non-const version)
-  template <class T, class A>
+  template <class T, class A> inline
   void save( BinaryOutputArchive & ar, std::forward_list<T, A> & forward_list )
   {
     // save position for size of list
diff --git a/binary_archive/list.hpp b/binary_archive/list.hpp
index 571db70f..7295a602 100644
--- a/binary_archive/list.hpp
+++ b/binary_archive/list.hpp
@@ -7,7 +7,7 @@
 namespace cereal
 {
   //! Saving for std::list to binary
-  template <class T, class A>
+  template <class T, class A> inline
   void save( BinaryOutputArchive & ar, std::list<T, A> const & list )
   {
     ar & list.size();
@@ -17,7 +17,7 @@ namespace cereal
   }
 
   //! Loading for std::list to binary
-  template <class T, class A>
+  template <class T, class A> inline
   void load( BinaryInputArchive & ar, std::list<T, A> & list )
   {
     size_t size;
diff --git a/binary_archive/map.hpp b/binary_archive/map.hpp
index 5032013b..60adc5ce 100644
--- a/binary_archive/map.hpp
+++ b/binary_archive/map.hpp
@@ -7,7 +7,7 @@
 namespace cereal
 {
   //! Saving for std::map to binary
-  template <class K, class T, class C, class A>
+  template <class K, class T, class C, class A> inline
   void save( BinaryOutputArchive & ar, std::map<K, T, C, A> const & map )
   {
     ar & map.size();
@@ -20,7 +20,7 @@ namespace cereal
   }
 
   //! Loading for std::map to binary
-  template <class K, class T, class C, class A>
+  template <class K, class T, class C, class A> inline
   void load( BinaryInputArchive & ar, std::map<K, T, C, A> & map )
   {
     size_t size;
@@ -38,7 +38,7 @@ namespace cereal
   }
 
   //! Saving for std::multimap to binary
-  template <class K, class T, class C, class A>
+  template <class K, class T, class C, class A> inline
   void save( BinaryOutputArchive & ar, std::multimap<K, T, C, A> const & multimap )
   {
     ar & multimap.size();
@@ -51,7 +51,7 @@ namespace cereal
   }
 
   //! Loading for std::multimap to binary
-  template <class K, class T, class C, class A>
+  template <class K, class T, class C, class A> inline
   void load( BinaryInputArchive & ar, std::multimap<K, T, C, A> & multimap )
   {
     size_t size;
diff --git a/binary_archive/memory.hpp b/binary_archive/memory.hpp
index c261d55e..a726d9ce 100644
--- a/binary_archive/memory.hpp
+++ b/binary_archive/memory.hpp
@@ -7,7 +7,7 @@
 namespace cereal
 {
   //! Saving std::shared_ptr to binary
-  template <class T>
+  template <class T> inline
   void save( BinaryOutputArchive & ar, std::shared_ptr<T> const & ptr )
   {
     uint32_t id = ar.registerSharedPointer( ptr.get() );
@@ -20,7 +20,7 @@ namespace cereal
   }
 
   //! Loading std::shared_ptr to binary
-  template <class T>
+  template <class T> inline
   void load( BinaryInputArchive & ar, std::shared_ptr<T> & ptr )
   {
     uint32_t id;
@@ -40,7 +40,7 @@ namespace cereal
   }
 
   //! Saving std::weak_ptr to binary
-  template <class T>
+  template <class T> inline
   void save( BinaryOutputArchive & ar, std::weak_ptr<T> const & ptr )
   {
     auto sptr = ptr.lock();
@@ -48,7 +48,7 @@ namespace cereal
   }
 
   //! Loading std::weak_ptr from binary
-  template <class T>
+  template <class T> inline
   void load( BinaryInputArchive & ar, std::weak_ptr<T> & ptr )
   {
     std::shared_ptr<T> sptr;
@@ -57,14 +57,14 @@ namespace cereal
   }
 
   //! Saving std::unique_ptr to binary
-  template <class T, class D>
+  template <class T, class D> inline
   void save( BinaryOutputArchive & ar, std::unique_ptr<T, D> const & ptr )
   {
     ar & *ptr;
   }
 
   //! Loading std::unique_ptr from binary
-  template <class T, class D>
+  template <class T, class D> inline
   void load( BinaryInputArchive & ar, std::unique_ptr<T, D> & ptr )
   {
     ptr.reset(new T);
diff --git a/binary_archive/queue.hpp b/binary_archive/queue.hpp
index d6f2b739..823572e3 100644
--- a/binary_archive/queue.hpp
+++ b/binary_archive/queue.hpp
@@ -9,7 +9,7 @@ namespace cereal
   namespace queue_detail
   {
     //! Allows access to the protected container in queue
-    template <class T, class C>
+    template <class T, class C> inline
     C const & container( std::queue<T, C> const & queue )
     {
       struct H : public std::queue<T, C>
@@ -24,7 +24,7 @@ namespace cereal
     }
 
     //! Allows access to the protected container in priority queue
-    template <class T, class C, class Comp>
+    template <class T, class C, class Comp> inline
     C const & container( std::priority_queue<T, C, Comp> const & priority_queue )
     {
       struct H : public std::priority_queue<T, C, Comp>
@@ -37,9 +37,9 @@ namespace cereal
 
       return H::get( priority_queue );
     }
-    
+
     //! Allows access to the protected comparator in priority queue
-    template <class T, class C, class Comp>
+    template <class T, class C, class Comp> inline
     Comp const & comparator( std::priority_queue<T, C, Comp> const & priority_queue )
     {
       struct H : public std::priority_queue<T, C, Comp>
@@ -55,14 +55,14 @@ namespace cereal
   }
 
   //! Saving for std::queue to binary
-  template <class T, class C>
+  template <class T, class C> inline
   void save( BinaryOutputArchive & ar, std::queue<T, C> const & queue )
   {
     ar & queue_detail::container( queue );
   }
 
   //! Loading for std::queue to binary
-  template <class T, class C>
+  template <class T, class C> inline
   void load( BinaryInputArchive & ar, std::queue<T, C> & queue )
   {
     C container;
@@ -71,7 +71,7 @@ namespace cereal
   }
 
   //! Saving for std::priority_queue to binary
-  template <class T, class C, class Comp>
+  template <class T, class C, class Comp> inline
   void save( BinaryOutputArchive & ar, std::priority_queue<T, C, Comp> const & priority_queue )
   {
     ar & queue_detail::comparator( priority_queue );
@@ -79,12 +79,12 @@ namespace cereal
   }
 
   //! Loading for std::priority_queue to binary
-  template <class T, class C, class Comp>
+  template <class T, class C, class Comp> inline
   void load( BinaryInputArchive & ar, std::priority_queue<T, C, Comp> & priority_queue )
   {
     Comp comparator;
     ar & comparator;
-    
+
     C container;
     ar & container;
 
diff --git a/binary_archive/set.hpp b/binary_archive/set.hpp
index 10c3c357..cdcbf491 100644
--- a/binary_archive/set.hpp
+++ b/binary_archive/set.hpp
@@ -7,7 +7,7 @@
 namespace cereal
 {
   //! Saving for std::set to binary
-  template <class K, class C, class A>
+  template <class K, class C, class A> inline
   void save( BinaryOutputArchive & ar, std::set<K, C, A> const & set )
   {
     ar & set.size();
@@ -17,7 +17,7 @@ namespace cereal
   }
 
   //! Loading for std::set to binary
-  template <class K, class C, class A>
+  template <class K, class C, class A> inline
   void load( BinaryInputArchive & ar, std::set<K, C, A> & set )
   {
     size_t size;
@@ -33,7 +33,7 @@ namespace cereal
   }
 
   //! Saving for std::multiset to binary
-  template <class K, class C, class A>
+  template <class K, class C, class A> inline
   void save( BinaryOutputArchive & ar, std::multiset<K, C, A> const & multiset )
   {
     ar & multiset.size();
@@ -43,7 +43,7 @@ namespace cereal
   }
 
   //! Loading for std::multiset to binary
-  template <class K, class C, class A>
+  template <class K, class C, class A> inline
   void load( BinaryInputArchive & ar, std::multiset<K, C, A> & multiset )
   {
     size_t size;
diff --git a/binary_archive/stack.hpp b/binary_archive/stack.hpp
index d831bfde..91231353 100644
--- a/binary_archive/stack.hpp
+++ b/binary_archive/stack.hpp
@@ -9,7 +9,7 @@ namespace cereal
   namespace stack_detail
   {
     //! Allows access to the protected container in stack
-    template <class T, class C>
+    template <class T, class C> inline
     C const & container( std::stack<T, C> const & stack )
     {
       struct H : public std::stack<T, C>
@@ -25,14 +25,14 @@ namespace cereal
   }
 
   //! Saving for std::stack to binary
-  template <class T, class C>
+  template <class T, class C> inline
   void save( BinaryOutputArchive & ar, std::stack<T, C> const & stack )
   {
     ar & stack_detail::container( stack );
   }
 
   //! Loading for std::stack to binary
-  template <class T, class C>
+  template <class T, class C> inline
   void load( BinaryInputArchive & ar, std::stack<T, C> & stack )
   {
     C container;
diff --git a/binary_archive/string.hpp b/binary_archive/string.hpp
index 2548f212..22fc66d8 100644
--- a/binary_archive/string.hpp
+++ b/binary_archive/string.hpp
@@ -7,7 +7,7 @@
 namespace cereal
 {
   //! Serialization for basic_string types to binary
-  template<class CharT, class Traits, class Alloc>
+  template<class CharT, class Traits, class Alloc> inline
   void save(BinaryOutputArchive & ar, std::basic_string<CharT, Traits, Alloc> const & str)
   {
     // Save number of chars + the data
@@ -16,7 +16,7 @@ namespace cereal
   }
 
   //! Serialization for basic_string types from binary
-  template<class CharT, class Traits, class Alloc>
+  template<class CharT, class Traits, class Alloc> inline
   void load(BinaryInputArchive & ar, std::basic_string<CharT, Traits, Alloc> & str)
   {
     size_t size;
diff --git a/binary_archive/unordered_map.hpp b/binary_archive/unordered_map.hpp
index ccdba4a0..1cb0b7d0 100644
--- a/binary_archive/unordered_map.hpp
+++ b/binary_archive/unordered_map.hpp
@@ -7,7 +7,7 @@
 namespace cereal
 {
   //! Saving for std::unordered_map to binary
-  template <class K, class T, class H, class KE, class A>
+  template <class K, class T, class H, class KE, class A> inline
   void save( BinaryOutputArchive & ar, std::unordered_map<K, T, H, KE, A> const & unordered_map )
   {
     ar & unordered_map.size();
@@ -20,7 +20,7 @@ namespace cereal
   }
 
   //! Loading for std::unordered_map to binary
-  template <class K, class T, class H, class KE, class A>
+  template <class K, class T, class H, class KE, class A> inline
   void load( BinaryInputArchive & ar, std::unordered_map<K, T, H, KE, A> & unordered_map )
   {
     size_t size;
@@ -40,7 +40,7 @@ namespace cereal
   }
 
   //! Saving for std::unordered_multimap to binary
-  template <class K, class T, class H, class KE, class A>
+  template <class K, class T, class H, class KE, class A> inline
   void save( BinaryOutputArchive & ar, std::unordered_multimap<K, T, H, KE, A> const & unordered_multimap )
   {
     ar & unordered_multimap.size();
@@ -53,7 +53,7 @@ namespace cereal
   }
 
   //! Loading for std::unordered_multimap to binary
-  template <class K, class T, class H, class KE, class A>
+  template <class K, class T, class H, class KE, class A> inline
   void load( BinaryInputArchive & ar, std::unordered_multimap<K, T, H, KE, A> & unordered_multimap )
   {
     size_t size;
diff --git a/binary_archive/unordered_set.hpp b/binary_archive/unordered_set.hpp
index ef1cadb9..3c413ca5 100644
--- a/binary_archive/unordered_set.hpp
+++ b/binary_archive/unordered_set.hpp
@@ -7,7 +7,7 @@
 namespace cereal
 {
   //! Saving for std::unordered_set to binary
-  template <class K, class H, class KE, class A>
+  template <class K, class H, class KE, class A> inline
   void save( BinaryOutputArchive & ar, std::unordered_set<K, H, KE, A> const & unordered_set )
   {
     ar & unordered_set.size();
@@ -17,7 +17,7 @@ namespace cereal
   }
 
   //! Loading for std::unordered_set to binary
-  template <class K, class H, class KE, class A>
+  template <class K, class H, class KE, class A> inline
   void load( BinaryInputArchive & ar, std::unordered_set<K, H, KE, A> & unordered_set )
   {
     size_t size;
@@ -35,7 +35,7 @@ namespace cereal
   }
 
   //! Saving for std::unordered_multiset to binary
-  template <class K, class H, class KE, class A>
+  template <class K, class H, class KE, class A> inline
   void save( BinaryOutputArchive & ar, std::unordered_multiset<K, H, KE, A> const & unordered_multiset )
   {
     ar & unordered_multiset.size();
@@ -45,7 +45,7 @@ namespace cereal
   }
 
   //! Loading for std::unordered_multiset to binary
-  template <class K, class H, class KE, class A>
+  template <class K, class H, class KE, class A> inline
   void load( BinaryInputArchive & ar, std::unordered_multiset<K, H, KE, A> & unordered_multiset )
   {
     size_t size;
diff --git a/binary_archive/vector.hpp b/binary_archive/vector.hpp
index 9ca3d22e..762f5106 100644
--- a/binary_archive/vector.hpp
+++ b/binary_archive/vector.hpp
@@ -7,7 +7,7 @@
 namespace cereal
 {
   //! Serialization for std::vectors of arithmetic (but not bool) types to binary
-  template <class T, class A>
+  template <class T, class A> inline
   typename std::enable_if<std::is_arithmetic<T>::value && !std::is_same<T, bool>::value, void>::type
   save( BinaryOutputArchive & ar, std::vector<T, A> const & vector )
   {
@@ -19,7 +19,7 @@ namespace cereal
   }
 
   //! Serialization for std::vectors of arithmetic (but not bool) types to binary
-  template <class T, class A>
+  template <class T, class A> inline
   typename std::enable_if<std::is_arithmetic<T>::value && !std::is_same<T, bool>::value, void>::type
   load( BinaryInputArchive & ar, std::vector<T, A> & vector )
   {
@@ -34,7 +34,7 @@ namespace cereal
   }
 
   //! Serialization for non-arithmetic (and bool) vector types to binary
-  template <class T, class A>
+  template <class T, class A> inline
   typename std::enable_if<!std::is_arithmetic<T>::value || std::is_same<T, bool>::value, void>::type
   save( BinaryOutputArchive & ar, std::vector<T, A> const & vector )
   {
@@ -44,7 +44,7 @@ namespace cereal
   }
 
   //! Serialization for non-arithmetic (and bool) vector types from binary
-  template <class T, class A>
+  template <class T, class A> inline
   typename std::enable_if<!std::is_arithmetic<T>::value || std::is_same<T, bool>::value, void>::type
   load( BinaryInputArchive & ar, std::vector<T, A> & vector )
   {
diff --git a/unittests.cpp b/unittests.cpp
index b0e43437..8eee6391 100644
--- a/unittests.cpp
+++ b/unittests.cpp
@@ -15,6 +15,7 @@
 #include <cereal/binary_archive/utility.hpp>
 #include <cereal/binary_archive/tuple.hpp>
 #include <cereal/binary_archive/bitset.hpp>
+#include <cereal/binary_archive/complex.hpp>
 #include <limits>
 #include <random>
 
@@ -154,6 +155,15 @@ std::basic_string<C> random_basic_string(std::mt19937 & gen)
   return s;
 }
 
+template <size_t N>
+std::string random_binary_string(std::mt19937 & gen)
+{
+  std::string s(N, ' ');
+  for(auto & c : s )
+    c = std::uniform_int_distribution<char>('0', '1')(gen);
+  return s;
+}
+
 // ######################################################################
 BOOST_AUTO_TEST_CASE( binary_pod )
 {
@@ -1668,3 +1678,84 @@ BOOST_AUTO_TEST_CASE( binary_tuple )
     BOOST_CHECK_EQUAL( i_espltuple == o_espltuple, true );
   }
 }
+
+// ######################################################################
+BOOST_AUTO_TEST_CASE( binary_complex )
+{
+  std::random_device rd;
+  std::mt19937 gen(rd());
+
+  auto rngF = [&](){ return random_value<float>(gen); };
+  auto rngD = [&](){ return random_value<double>(gen); };
+  auto rngLD = [&](){ return random_value<long double>(gen); };
+
+  for(int i=0; i<100; ++i)
+  {
+    std::ostringstream os;
+    cereal::BinaryOutputArchive oar(os);
+
+    std::complex<float> o_float( rngF(), rngF() );
+    std::complex<double> o_double( rngD(), rngD() );
+    std::complex<long double> o_ldouble( rngLD(), rngLD() );
+
+    oar & o_float;
+    oar & o_double;
+    oar & o_ldouble;
+
+    std::istringstream is(os.str());
+    cereal::BinaryInputArchive iar(is);
+
+    std::complex<float> i_float;
+    std::complex<double> i_double;
+    std::complex<long double> i_ldouble;
+
+    iar & i_float;
+    iar & i_double;
+    iar & i_ldouble;
+
+    BOOST_CHECK_EQUAL( o_float, i_float );
+    BOOST_CHECK_EQUAL( o_double, i_double );
+    BOOST_CHECK_EQUAL( o_ldouble, i_ldouble );
+  }
+}
+
+// ######################################################################
+BOOST_AUTO_TEST_CASE( binary_bitset )
+{
+  std::random_device rd;
+  std::mt19937 gen(rd());
+
+  auto rng32  = [&](){ return random_binary_string<32>( gen ); };
+  auto rng65  = [&](){ return random_binary_string<65>( gen ); };
+  auto rng256 = [&](){ return random_binary_string<256>( gen ); };
+
+  for(int i=0; i<100; ++i)
+  {
+    std::ostringstream os;
+    cereal::BinaryOutputArchive oar(os);
+
+    std::bitset<32> o_bit32( rng32() );
+    std::bitset<65> o_bit65( rng65() );
+    std::bitset<256> o_bit256( rng256() );
+
+    oar & o_bit32;
+    oar & o_bit65;
+    oar & o_bit256;
+
+    std::istringstream is(os.str());
+    cereal::BinaryInputArchive iar(is);
+
+    std::bitset<32>  i_bit32;
+    std::bitset<65>  i_bit65;
+    std::bitset<256> i_bit256;
+
+    iar & i_bit32;
+    iar & i_bit65;
+    iar & i_bit256;
+
+    BOOST_CHECK_EQUAL( o_bit32, i_bit32 );
+    BOOST_CHECK_EQUAL( o_bit65, i_bit65 );
+    BOOST_CHECK_EQUAL( o_bit256, i_bit256 );
+  }
+}
+