Issue #4; fixed class naming convention;