bump to version 1.5.4
minor doc update
Merge branch 'master' into flex