2018-11-21

Updated for use in C++17 compiler. This breaks compatibility to older C++.