Changes for revision 0.4