Additions to version 0.5.5