diff --git a/include/crap/algorithm.d/maxvalue.h b/include/crap/algorithm.d/maxvalue.h
index 4b504c0..ad88ce1 100644
--- a/include/crap/algorithm.d/maxvalue.h
+++ b/include/crap/algorithm.d/maxvalue.h
@@ -1,7 +1,10 @@
 #ifndef CRAP_ALGORITHM_MAXVALUE
 #define CRAP_ALGORITHM_MAXVALUE
 
+#include <type_traits>
+
 #include "../numeric.d/reducevalue.h"
+#include "../version.d/libintegralconstantcallable.h"
 
 namespace crap
 {
@@ -9,19 +12,11 @@ namespace crap
 
  template <class Type, template <Type, Type> class Operator, Type Value>
 	 struct maxValue<Type, Operator, Value>
- {
-  constexpr const static Type value = Value;
-  using value_type = decltype(value);
-  constexpr operator value_type () const noexcept;
- };
+	 : std :: integral_constant<Type, Value> {};
 
  template <class Type, template <Type, Type> class Operator, Type Value1, Type Value2>
 	 struct maxValue<Type, Operator, Value1, Value2>
- {
-  constexpr const static Type value = ((Operator <Value2, Value1> :: value) ? Value1 : Value2);
-  using value_type = decltype(value);
-  constexpr operator value_type () const noexcept;
- };
+	 : std :: integral_constant<Type, ((Operator <Value2, Value1> :: value) ? Value1 : Value2)> {};
 
  template <class Type, template <Type, Type> class Operator, Type ... Values>
 	 struct maxValue
@@ -33,27 +28,25 @@ namespace crap
   constexpr const static Type value = reduceValue <Type, This, Values...> :: value;
   using value_type = decltype(value);
   constexpr operator value_type () const noexcept;
+#if (crap_lib_integral_constant_callable >= 201304L)
+  constexpr value_type operator () () const noexcept;
+#endif
  };
 }
 
-template <class Type, template <Type, Type> class Operator, Type Value1>
-        inline constexpr crap :: maxValue <Type, Operator, Value1> :: operator
-        typename crap :: maxValue <Type, Operator, Value1> :: value_type () const noexcept
-{
- return crap :: maxValue <Type, Operator, Value1> :: value;
-}
-
-template <class Type, template <Type, Type> class Operator, Type Value1, Type Value2>
-        inline constexpr crap :: maxValue <Type, Operator, Value1, Value2> :: operator
-        typename crap :: maxValue <Type, Operator, Value1, Value2> :: value_type () const noexcept
+template <class Type, template <Type, Type> class Operator, Type ... Values>
+        inline constexpr crap :: maxValue <Type, Operator, Values...> :: operator
+        typename crap :: maxValue <Type, Operator, Values...> :: value_type () const noexcept
 {
- return crap :: maxValue <Type, Operator, Value1, Value2> :: value;
+ return crap :: maxValue <Type, Operator, Values...> :: value;
 }
+#if (crap_lib_integral_constant_callable >= 201304L)
 
 template <class Type, template <Type, Type> class Operator, Type ... Values>
-        inline constexpr crap :: maxValue <Type, Operator, Values...> :: operator
-        typename crap :: maxValue <Type, Operator, Values...> :: value_type () const noexcept
+	inline constexpr typename crap :: maxValue <Type, Operator, Values...> :: value_type
+	crap :: maxValue <Type, Operator, Values...> :: operator () () const noexcept
 {
  return crap :: maxValue <Type, Operator, Values...> :: value;
 }
 #endif
+#endif