improved class model
Merge branch 'master' of https://github.com/pokulo/raSpBBery