Additions to version 0.1.18