Changes for version 0.20