updated to work with osclass 3.2,
fixed issues #141 #151 & #154