Merge pull request #118 from balshetzer/master

make release 2.5.5
Merge pull request #120 from balshetzer/master

merge