Changes for version 0.21