5.4.0
Merge pull request #20 from jstart/master

5.4.0 Update