fixed #36, changed form class