Added include folder (Compilation purpose)
Fixed constexpr error
Fixed constexpr error