removed namespace classe
initial implementation without namespace
added features