Fix: increased version in CMakeLists to 1.5.4
Merge branch 'v1.5-fixes'