Initial checkin of version 0.4-beta