Merge pull request #116 from balshetzer/master

A variety of updates
bump version to 2.5.4
update for v2.5.4